xend: pass-through: prefix vslot with 0x in device configration
authorKeir Fraser <keir.fraser@citrix.com>
Thu, 4 Jun 2009 09:39:32 +0000 (10:39 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Thu, 4 Jun 2009 09:39:32 +0000 (10:39 +0100)
I don't know of the historical reasons for this, but by convention
hex values are stored without a leading '0x' in the backend and
with a leading '0x' in the device configuration.

This patch also removes handling of the case where vslot is missing
from the backend, should never occur.

Signed-off-by: Simon Horman <horms@verge.net.au>
tools/python/xen/xend/server/pciif.py

index 1e0572cf9e9f28cc5d4f9fcd61af768ba3ca2b23..2f55e346fa69e6f3915ed3f6b5f6759f2eeefa21 100644 (file)
@@ -191,11 +191,8 @@ class PciController(DevController):
 
                 # Per device uuid info
                 dev_dict['uuid'] = self.readBackend(devid, 'uuid-%d' % i)
-                vslot = self.readBackend(devid, 'vslot-%d' % i)
-                if vslot != None:
-                    dev_dict['vslot'] = self.readBackend(devid, 'vslot-%d' % i)
-                else:
-                    dev_dict['vslot'] = AUTO_PHP_SLOT_STR
+                dev_dict['vslot'] = '0x%s' % \
+                                    self.readBackend(devid, 'vslot-%d' % i)
 
                 #append opts info
                 opts = self.readBackend(devid, 'opts-%d' % i)